Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 16 Aug 2011 05:58:30 +0000 (22:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 16 Aug 2011 05:58:30 +0000 (22:58 -0700)
commit52704c766e1ad043e0f4e523e5e2597e9564f215
tree8df69e444c0c319b26bb0c5d9acf4d0d4e7b20e2
parent79bee61a14f4c74682e0e601d29731f7db0a9118
parent1359fcbd08da744bb04d20acdd428dac4342bd7f
Merge from trunk.